Index: webapp/src/main/java/info/magnolia/cms/gui/misc/Sources.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>windows-1252
===================================================================
--- webapp/src/main/java/info/magnolia/cms/gui/misc/Sources.java (revision 454)
+++ webapp/src/main/java/info/magnolia/cms/gui/misc/Sources.java (revision )
@@ -60,20 +60,32 @@
}
public String getHtmlJs() {
- StringBuffer html = new StringBuffer();
+ return getHtmlJs(false);
+ }
+ public String getHtmlJs(boolean excludeCalendarResources) {
+ StringBuilder html = new StringBuilder();
+
html.append("\n"); //$NON-NLS-1$
html.append("\n"); //$NON-NLS-1$
+ html.append("/.magnolia/pages/messages.").append(MgnlContext.getUser().getLanguage()).append(".js\">\n"); //$NON-NLS-1$
html.append("\n"); //$NON-NLS-1$
+ if (!excludeCalendarResources) {
+ appendCalendarResources(html);
+ }
+
+ return html.toString();
+ }
+
+ private void appendCalendarResources(final StringBuilder html) {
html.append("\n");
@@ -91,12 +103,10 @@
html.append("\n");
-
- return html.toString();
}
public String getHtmlCss() {
- StringBuffer html = new StringBuffer();
+ StringBuilder html = new StringBuilder();
html.append("\n"); //$NON-NLS-1$
Index: webapp/src/main/java/info/magnolia/templating/elements/InitElement.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>windows-1252
===================================================================
--- webapp/src/main/java/info/magnolia/templating/elements/InitElement.java (revision 454)
+++ webapp/src/main/java/info/magnolia/templating/elements/InitElement.java (revision )
@@ -97,11 +97,12 @@
Sources src = new Sources(MgnlContext.getContextPath());
MarkupHelper helper = new MarkupHelper(out);
helper.append("\n");
- helper.append("\n");
+ helper.append("\n");
helper.append(src.getHtmlCss());
- helper.append(src.getHtmlJs());
- helper.append("\n");
- helper.append("\n");
+ // exclude calendar resources in edit mode, because of possible css and js conflicts
+ helper.append(src.getHtmlJs(true));
+ helper.append("\n");
+ helper.append("\n");
try {
if (content != null) {